Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 29 Mar 2011 23:35:49 +0000 (16:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 29 Mar 2011 23:35:49 +0000 (16:35 -0700)
commit17dfa81f0c03f6f2b24984902b2aa23e47dc0843
tree39a282cfb6300d633ad7ea5433e8037d3acbd6a9
parent2fabe48f00584a4adbe988871354482ed48fcd6c
parent1fcbcafd1fea82a977683ad7d6fe5fccd945a45b
Merge from mainline.
src/ChangeLog
src/character.c
src/coding.c
src/editfns.c
src/eval.c
src/keyboard.c
src/lisp.h
src/xdisp.c